Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Fri, 15 Jan 2010 17:01:04 +0000 (18:01 +0100)
committerJan D. <jan.h.d@swipnet.se>
Fri, 15 Jan 2010 17:01:04 +0000 (18:01 +0100)
commite12fcd6a19e3eb4971a07267c55eb40abe81827a
treef5f9c290f57acd42c21ab60306cc0133f754ef24
parent3a76334accf4379a94108a64f3f44c095e78313d
parentaa0c95604d2e1726c19369870d519abc1b59416a
Merge from trunk